From: Jyrki Gadinger <nilsding@nilsding.org>
Date: Fri, 31 Jan 2025 09:54:52 +0000 (+0100)
Subject: use correct qml style on Windows
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~2^2~97^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=438391d37aa02b3d5f3cd6534ad8046e4dedfd7f;p=nextcloud-desktop.git

use correct qml style on Windows

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
---

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 25322ac08..46fcfcc4d 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -78,25 +78,30 @@ int main(int argc, char **argv)
 
     QQuickWindow::setTextRenderType(QQuickWindow::NativeTextRendering);
 
-    auto style = QStringLiteral("Fusion");
+    auto qmlStyle = QStringLiteral("Fusion");
+    auto widgetsStyle = QStringLiteral("");
 
 #if defined Q_OS_MAC
-    style = QStringLiteral("macOS");
-#endif
-
-    QQuickStyle::setStyle(style);
-    QQuickStyle::setFallbackStyle(QStringLiteral("Fusion"));
-
-#if defined Q_OS_WIN
+    qmlStyle = QStringLiteral("macOS");
+#elif defined Q_OS_WIN
     if (QOperatingSystemVersion::current().version() < QOperatingSystemVersion::Windows11.version()) {
-        QApplication::setStyle(QStyleFactory::create("Universal"));
+        qmlStyle = QStringLiteral("Universal");
+        widgetsStyle = QStringLiteral("Fusion");
     } else {
-        style = QStringLiteral("FluentWinUI3");
+        qmlStyle = QStringLiteral("FluentWinUI3");
+        widgetsStyle = QStringLiteral("windows11");
     }
 #endif
 
+    QQuickStyle::setStyle(qmlStyle);
+    QQuickStyle::setFallbackStyle(QStringLiteral("Fusion"));
+
     OCC::Application app(argc, argv);
 
+    if (!widgetsStyle.isEmpty()) {
+        QApplication::setStyle(QStyleFactory::create(widgetsStyle));
+    }
+
 #ifndef Q_OS_WIN
     signal(SIGPIPE, SIG_IGN);
 #endif